apas Merge pull request #6 from skorokithakis/master …