closes #15
Merged unary_expression branch with dev