Merge pull request #17 from wanprabu/master

Pull request for the issues