Merge pull request #1 from OctoFalcon/master

Merge
Merge pull request #5 from adikampli/master

Merge pull request #1 from OctoFalcon/master