Merge pull request #8 from scalableinternetservices/development

Development
Merge pull request #12 from badnack/development

Development
Merge pull request #13 from badnack/development

Development
Merge pull request #14 from badnack/development

Development
Merge pull request #15 from badnack/master

Update README.md
Merge remote-tracking branch 'upstream/development' into development
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into development