Refactoring
Merge pull request #13 from svnfqt/master

Refactoring