First independent commit to new branch haskadd
Merge branch 'haskadd'