Layout and bugfixes
Merge branch 'master' of https://github.com/InformatriX/informatrix
Updated javadoc
Resolved merge conflict