l3uddz Merge pull request #9 from l3uddz/dev …