merge
* minor changes to accomodate for merging
cleanup & merge changes
* merging collaborative changes
Merge pull request #7 from jessonfoo/jesson

Jesson