Version 1.0.4

Some Pull Request and Layouts. See ReadMe for details