Bug fix #13
Bug fix #14