Merge pull request #3 from Neoracle/master

sync
Merge pull request #4 from Neoracle/master

pull
Merge pull request #51 from khairulinho/master

pull