fixed upper limit on counter
added exception for non-integers
updating master with final build