Initial commit
Merge http://github.com/twardakm/Robberto