Initial commit
Merge pull request #2 from fercik/development

#2 Merging development changes into master