general update
Merge pull request #3 from Chaasof/master

general update