Merge pull request #6 from gers0n/master

up date 27 sept 2014