Merge pull request #46 from pstephen43/master

sync up
added useless things
merging