Merge pull request #45 from bcordis/master

This pull add Many things