updated for version 0.1.2