[Issue #195] Added test and improved usability