Merge #19 into the development branch

The changes were made in the master branch, but they have to pass through the development branch first