Version 2 final

Version 2.0 final + unit testing scripts