BUGFIX: Issue #41 Deprecated control

Some grunt work...changed control / end_control to loop / end_loop