Testing

Issues #3 and #4 solved; merged with master