updates
Merge pull request #4 from Caustic/develop2

updates