Merged in aleksandarfaraj/sharkpants (pull request #8)

hey
Merged in aleksandarfaraj/sharkpants (pull request #9)

massa layout ändringar
fixat autogenerering
Merged TeamPony/sharkpants into master