Updated to Framework 0.1.7. Removed duplicated function.