Merge pull request #11 from r000n/master

Small fixes