Initial Commit
Merge http://github.com/kosturja/masters