Removed hard-coded constants. Closed #34.