Merge pull requst #107 ramaciotti