Initial commit
Merge pull request #1 from fercik/development

#1 Merging development changes into gh-pages