Merge pull request #11 from creising/dev

Dev
rolled version
merged with master