Merge pull request #16 from Alphadelta14/master

Resolve origin/dev into origin/master