Merge pull request #11 from NEKTech-Labs/master

Pull from master
Merge pull request #18 from NEKTech-Labs/V0.1

Merge pull request #11 from NEKTech-Labs/master