Finished new features. Ready for merging.
Merge pull request #1 from free2bcreative/newFeature

Finished new features. Ready for merging.