major refactoring
fixed coding standard errors
Merge pull request #11 from zelgerj/master

major refactoring