general update
Merge pull request #4 from Chaasof/master

general update