Merge pull request #53 from diantahoc/master

New stuffs and improvements.
Small status update
Merge remote-tracking branch 'remotes/hexf/master'