master: 651a3a789d7e13747a0179d77a64e9039ee6a26d Merge pull request #6 from vasiliosz/develop