Merge pull request #4 from GreyThompson/development

Development - bringing everything up to date.
changes
Merge pull request #7 from GreyThompson/rockemsockem

Rockemsockem