7.12.2013 Refactor project
Merge pull request #1 from ivied/123

7.12.2013 Refactor project