Merge pull request #1 from codaxy/master

Fork Update
Merge pull request #11 from dejanradic/master

Merge pull request #1 from codaxy/master