Jadler modularization
copyright changed to 2013