Merge pull request #11 from 0xor1/dev

master