merges #11 & #12