committing for backup
Merge branch 'dev' into issue87
added in method for timing
fixing merge conflicts
committing for backup
Merge branch 'dev' into issue87