added comments
added mixin method
updated test page