Changed argument/variable/property names so they make sense
Updated defaults and reduced demo to 100 iterations
Merge branch 'issue7' into dev