Addes some asserts
Tagged version 0.6.6