closes #46: merged and updated  ionixjunior contributions