Version 0.1.2 - refactored code to MVC topology