Refined architecture in pres
Merge branch 'master' of https://github.com/vipulkohli/JHalma