Ssekono/waterbird — pull request #1 by Ssekono (2013-11-13 13:07:59+00:00)
Title: Merging v1.0 branch with master branch

Merging content of v1.0 branch into master branch