Fixed #69. Removed default values