Merge pull request #14 from Wolfenswan/dev

Merging Dev into Master
Added comments