Corrected bugs; Updated templates; version 0.8.1