Merge pull request #1 from fjpg/master

new mess