Merge pull request #1 from impetus-opensource/trunk

Trunk