add disable and enable functions for testing
simplified argument handling
added tests
updated build