Merge pull request #12 from nikiroo/fixes