novaspirit Merge pull request #5 from sherylynn/master