Merge pull request #64 from RAlmada/master

replacing collections with arraylists