Merge pull request #9 from EnginesOS/current

Merge pull request #8 from EnginesOS/master
Merge pull request #10 from EnginesOS/master

Merge pull request #9 from EnginesOS/current