Master

Re issues #23 & #27